headerbar: Add gtk_header_bar_remove

This is a replacement for gtk_container_remove.

diff --git a/docs/reference/gtk/gtk4-sections.txt b/docs/reference/gtk/gtk4-sections.txt
index aec527c5baaf555a7556287a70cb4339cdfa7ef2..c300fd207ec8f6b792aedea76f843d25692f47b4 100644 (file)
--- a/docs/reference/gtk/gtk4-sections.txt
+++ b/docs/reference/gtk/gtk4-sections.txt
@@ -5597,6 +5597,7 @@ gtk_header_bar_set_title_widget
 gtk_header_bar_get_title_widget
 gtk_header_bar_pack_start
 gtk_header_bar_pack_end
+gtk_header_bar_remove
 gtk_header_bar_set_show_title_buttons
 gtk_header_bar_get_show_title_buttons
 gtk_header_bar_set_decoration_layout

diff --git a/gtk/gtkheaderbar.c b/gtk/gtkheaderbar.c
index eee669e2c83f783fd6a61d4280fed45e17769978..208415c701d466f67b171a34dcb94e5b57e0132d 100644 (file)
--- a/gtk/gtkheaderbar.c
+++ b/gtk/gtkheaderbar.c
@@ -495,31 +495,38 @@ gtk_header_bar_add (GtkContainer *container,
   gtk_header_bar_pack (GTK_HEADER_BAR (container), child, GTK_PACK_START);
 }
 
-static void
-gtk_header_bar_remove (GtkContainer *container,
-                       GtkWidget    *widget)
+/**
+ * gtk_header_bar_remove:
+ * @bar: a #GtkHeaderBar
+ * @child: the child to remove
+ *
+ * Removes a child from @bar, after it has been added
+ * with gtk_header_bar_pack_start(), gtk_header_bar_pack_end()
+ * or gtk_header_bar_set_title_widget().
+ */
+void
+gtk_header_bar_remove (GtkHeaderBar *bar,
+                       GtkWidget    *child)
 {
-  GtkHeaderBar *bar = GTK_HEADER_BAR (container);
   GtkHeaderBarPrivate *priv = gtk_header_bar_get_instance_private (bar);
   GtkWidget *parent;
   gboolean removed = FALSE;
 
-  parent = gtk_widget_get_parent (widget);
+  parent = gtk_widget_get_parent (child);
 
   if (parent == priv->start_box)
     {
-      gtk_container_remove (GTK_CONTAINER (priv->start_box), widget);
+      gtk_container_remove (GTK_CONTAINER (priv->start_box), child);
       removed = TRUE;
     }
   else if (parent == priv->end_box)
     {
-      gtk_container_remove (GTK_CONTAINER (priv->end_box), widget);
+      gtk_container_remove (GTK_CONTAINER (priv->end_box), child);
       removed = TRUE;
     }
-  else if (parent == GTK_WIDGET (container) &&
-           gtk_center_box_get_center_widget (GTK_CENTER_BOX (priv->center_box)) == widget)
+  else if (parent == priv->center_box)
     {
-      gtk_widget_unparent (widget);
+      gtk_center_box_set_center_widget (GTK_CENTER_BOX (priv->center_box), NULL);
       removed = TRUE;
     }
 

diff --git a/gtk/gtkheaderbar.h b/gtk/gtkheaderbar.h
index 23334c546980d5a8337b9641dc6ac4f036d65d18..0bbd5917596130af22468fd15838ed61460b9790 100644 (file)
--- a/gtk/gtkheaderbar.h
+++ b/gtk/gtkheaderbar.h
@@ -50,6 +50,9 @@ void         gtk_header_bar_pack_start        (GtkHeaderBar *bar,
 GDK_AVAILABLE_IN_ALL
 void         gtk_header_bar_pack_end          (GtkHeaderBar *bar,
                                                GtkWidget    *child);
+GDK_AVAILABLE_IN_ALL
+void         gtk_header_bar_remove            (GtkHeaderBar *bar,
+                                               GtkWidget    *child);
 
 GDK_AVAILABLE_IN_ALL
 gboolean     gtk_header_bar_get_show_title_buttons (GtkHeaderBar *bar);